How do I stop the genie?

Hint 1 of 9:

You can only stop the genie after you've followed the vizier.
Go upstairs to follow him and wait for Shamir to show up again.

Hint 2 of 9:

You did talk to Jollo, didn't you?

Hint 3 of 9:

I hope you made a plan to stop vizier and the genie.

Hint 4 of 9:

At some point, you should have found a look-alike bottle for the genie.

Hint 5 of 9:

Did you ever play a trick on the genie?

Hint 6 of 9:

See Isle of the Wonder / Which bottle should I take? question.

Hint 7 of 9:

Jollo's room is in the east hallway of the basement.

Hint 8 of 9:

Give him the proper bottle before you go to the wedding.